GtkBuilder: Ensure types are fully initialized
authorMatthias Clasen <mclasen@redhat.com>
Fri, 30 May 2014 16:39:07 +0000 (12:39 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 30 May 2014 16:39:07 +0000 (12:39 -0400)
Just calling get_type() does not ensure that the signals, properties
and everything else gets set up properly. Ensure it is, by calling
g_type_class_ref() before using the type. This fixes the testcase
added in the previous commit.

gtk/gtkbuilder.c

index f6e5c52e4fd1611db5c00f359840d0327e4c0fb2..60927df10e9a5e53ace08a7868c34f1e313945d9 100644 (file)
@@ -2275,10 +2275,17 @@ GType
 gtk_builder_get_type_from_name (GtkBuilder  *builder, 
                                 const gchar *type_name)
 {
+  GType type;
+
   g_return_val_if_fail (GTK_IS_BUILDER (builder), G_TYPE_INVALID);
   g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
 
-  return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
+  type = GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
+
+  if (G_TYPE_IS_CLASSED (type))
+    g_type_class_unref (g_type_class_ref (type));
+
+  return type;
 }
 
 GQuark